windowManager: Redo WorkspaceSwitchAction to be a Clutter.SwipeAction

Just reuse this gesture rather than implementing edge detection ourselves.
As a plus, we might get touchpad swipe support when Clutter handles it.

https://bugzilla.gnome.org/show_bug.cgi?id=749742

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 01d510736f86a4488fe46ebe7736a599845215e4..ecf6051e029db6b45aa518dde3acaf2615f82daf 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -480,50 +480,42 @@ const TilePreview = new Lang.Class({
 
 const WorkspaceSwitchAction = new Lang.Class({
     Name: 'WorkspaceSwitchAction',
-    Extends: Clutter.GestureAction,
+    Extends: Clutter.SwipeAction,
 
     _init : function() {
+        const MOTION_THRESHOLD = 50;
+
         this.parent();
         this.set_n_touch_points(4);
+        this.set_threshold_trigger_distance(MOTION_THRESHOLD, MOTION_THRESHOLD);
 
         global.display.connect('grab-op-begin', Lang.bind(this, function() {
             this.cancel();
         }));
     },
 
-    vfunc_gesture_prepare : function(action, actor) {
+    vfunc_gesture_prepare : function(actor) {
         let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
-        return this.get_n_current_points() == this.get_n_touch_points() &&
-               (allowedModes & Main.actionMode);
-    },
 
-    vfunc_gesture_end : function(action, actor) {
-        const MOTION_THRESHOLD = 50;
+        if (!this.parent(actor))
+            return false;
 
-        // Just check one touchpoint here
-        let [startX, startY] = this.get_press_coords(0);
-        let [x, y] = this.get_motion_coords(0);
-        let offsetX = x - startX;
-        let offsetY = y - startY;
-        let direction;
+        return (allowedModes & Main.actionMode);
+    },
 
-        if (Math.abs(offsetX) < MOTION_THRESHOLD &&
-            Math.abs(offsetY) < MOTION_THRESHOLD)
-            return;
+    vfunc_swept : function(actor, direction) {
+        let dir;
 
-        if (Math.abs(offsetY) > Math.abs(offsetX)) {
-            if (offsetY > 0)
-                direction = Meta.MotionDirection.UP;
-            else
-                direction = Meta.MotionDirection.DOWN;
-        } else {
-            if (offsetX > 0)
-                direction = Meta.MotionDirection.LEFT;
-            else
-                direction = Meta.MotionDirection.RIGHT;
-        }
+        if (direction & Clutter.SwipeDirection.UP)
+            dir = Meta.MotionDirection.DOWN;
+        else if (direction & Clutter.SwipeDirection.DOWN)
+            dir = Meta.MotionDirection.UP;
+        else if (direction & Clutter.SwipeDirection.LEFT)
+            dir = Meta.MotionDirection.RIGHT;
+        else if (direction & Clutter.SwipeDirection.RIGHT)
+            dir = Meta.MotionDirection.LEFT;
 
-        this.emit('activated', direction);
+        this.emit('activated', dir);
     }
 });
 Signals.addSignalMethods(WorkspaceSwitchAction.prototype);